Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Revert "enable ThinLTO for rustc on x86_64-apple-darwin dist builds" #105646

Merged
merged 1 commit into from
Dec 13, 2022

Conversation

lqd
Copy link
Member

@lqd lqd commented Dec 13, 2022

Apparently ThinLTO on x64 mac can regress some of the ICEs' output. This reverts #103647 to allow for investigation, and helps with #105637 in the meantime.

@rustbot
Copy link
Collaborator

rustbot commented Dec 13, 2022

r? @Mark-Simulacrum

(rustbot has picked a reviewer for you, use r? to override)

@rustbot rustbot added A-testsuite Area: The testsuite used to check the correctness of rustc S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-infra Relevant to the infrastructure team, which will review and decide on the PR/issue. labels Dec 13, 2022
@Mark-Simulacrum
Copy link
Member

Interesting. Revert seems okay for now.

@bors r+ rollup

@bors
Copy link
Contributor

bors commented Dec 13, 2022

📌 Commit ddb6fe2 has been approved by Mark-Simulacrum

It is now in the queue for this repository.

@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Dec 13, 2022
Dylan-DPC added a commit to Dylan-DPC/rust that referenced this pull request Dec 13, 2022
Revert "enable ThinLTO for rustc on x86_64-apple-darwin dist builds"

Apparently ThinLTO on x64 mac can regress some of the ICEs' output. This reverts rust-lang#103647 to allow for investigation, and fixes  rust-lang#105637 in the meantime.
@matthiaskrgr
Copy link
Member

@bors rollup=never for perf and bisection purposes

@apiraino
Copy link
Contributor

Does it need a backport?

@lqd
Copy link
Member Author

lqd commented Dec 13, 2022

Not on mac no. We likely need a similar PR for the linux builders though and backport that.

@bors
Copy link
Contributor

bors commented Dec 13, 2022

⌛ Testing commit ddb6fe2 with merge aa5b179...

@bors
Copy link
Contributor

bors commented Dec 13, 2022

☀️ Test successful - checks-actions
Approved by: Mark-Simulacrum
Pushing aa5b179 to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Dec 13, 2022
@bors bors merged commit aa5b179 into rust-lang:master Dec 13, 2022
@rustbot rustbot added this to the 1.68.0 milestone Dec 13, 2022
@lqd lqd deleted the revert-thinlto branch December 13, 2022 19:03
@rust-timer
Copy link
Collaborator

Finished benchmarking commit (aa5b179): comparison URL.

Overall result: ✅ improvements - no action needed

@rustbot label: -perf-regression

Instruction count

This is a highly reliable metric that was used to determine the overall result at the top of this comment.

mean range count
Regressions ❌
(primary)
- - 0
Regressions ❌
(secondary)
- - 0
Improvements ✅
(primary)
-1.0% [-1.1%, -0.9%] 2
Improvements ✅
(secondary)
-2.0% [-2.6%, -0.8%] 7
All ❌✅ (primary) -1.0% [-1.1%, -0.9%] 2

Max RSS (memory usage)

Results

This is a less reliable metric that may be of interest but was not used to determine the overall result at the top of this comment.

mean range count
Regressions ❌
(primary)
- - 0
Regressions ❌
(secondary)
- - 0
Improvements ✅
(primary)
- - 0
Improvements ✅
(secondary)
-5.5% [-7.3%, -3.0%] 3
All ❌✅ (primary) - - 0

Cycles

This benchmark run did not return any relevant results for this metric.

@lqd
Copy link
Member Author

lqd commented Dec 13, 2022

These perf results are noise.

bors added a commit to rust-lang-ci/rust that referenced this pull request Dec 19, 2022
…mulacrum

Re-enable ThinLTO for rustc on `x86_64-apple-darwin`

ThinLTO was disabled on x64 mac in rust-lang#105646 because of the rust-lang#105637 regression.

It was later discovered that the issue was present on other targets as well, as the mac revert was already landing. The linux/win reverts, however, did not land before the root cause was identified.

rust-lang#105800 fixed the underlying issue in `-Zdylib-lto` handling, and the x64 msvc and linux targets are now fixed, ICEs are using the correct `rustc_driver` panic hook.

This PR re-enables ThinLTO on mac for improved perf now that the issue should be fixed everywhere.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
A-testsuite Area: The testsuite used to check the correctness of rustc merged-by-bors This PR was explicitly merged by bors. S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. T-infra Relevant to the infrastructure team, which will review and decide on the PR/issue.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

7 participants